From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 18 Apr 2013 16:48:58 +0000 (+0200)
Subject: Merge branch 'batman'
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=1e99610f2680ec75c9422504fa2c09b8e41716c0;p=feed%2Frouting.git

Merge branch 'batman'
---

1e99610f2680ec75c9422504fa2c09b8e41716c0